Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 05:16:15 +0000 (21:16 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 05:16:15 +0000 (21:16 -0800)
commit5eab8f9fe430db61a71d28b62c9016367200cf68
treed54ea8c667fac13e108024adbbfbfc6424843129
parent2f5aaec4ba7b778685b47a903eeb35b3fc934877
parentb7c26b1e98569e500f43fd1f7c000b25403fa6b6
Merge from mainline.